Should help to solve #29 for 0.6 packages