fixed bug (for real this time)