Improve hackfix