Finally fixes the fugly foreach fixes #12

Signed-off-by: Suki <suki@missallsunday.com>
Hopefully? fixes #14

Signed-off-by: Suki <suki@missallsunday.com>