Added a small hack