added a fix from community