F for 1.5.2 Fixes #6