Issue 554

this should fix issue #554 from the tracker