temp solution for handler