Fix for Clockwork