#13 - Reworked soters. Should fix the issue