Fix changes yesterday because someone overwritten my code... :S