Last commit had hard coded bug, fixed