This commit fixes previous bug filled commit