Fix #214

http://www-01.ibm.com/support/docview.wss?uid=swg21391054