Fix for #1

@vicfryzel please review this change.