Removed temp. bug