Fixed Logic

For real this time!