Should fix #425 kinda.