Fix handle positioning on custom states