Fixed problems created by previous "fix" :D