fixed constant-handling