Added hack