Fixed #6 as suggested by Aurelio. Many thanks!