Fixes ticket 126