Added fix for ARM builds #37