Issue 282

Fix #282 
This block of code seems to be a duplicate of lines 2147 to 2151 or am I missing something? Can you remove it otherwise?