Adding fix suggested by Pomf