Fixes req#1