Added a little hack