fixed my bug, removed daniels workaround