Fixed problem w. commit 8bc4a9223