Fix #261 again...
Fix #261 again...

robvanmieghem/clams,Kefkius/clams,Kefkius/clams,nochowderforyou/clams,nochowderforyou/clams,Kefkius/clams,robvanmieghem/clams,Kefkius/clams,robvanmieghem/clams,nochowderforyou/clams,robvanmieghem/clams,nochowderforyou/clams,robvanmieghem/clams,nochowderforyou/clams,Kefkius/clams