andrewbtran fixed code