temp fix for handler issue