Fix for chorus 1.6.3