LatvianModder's fix #1