Galaxy S6 Delayed Lock since Nougat

[AC Question]

I updated to Nougat last weekend, and since then, every time i turn off the screen, the lock screen isnt locked correctly for at least 30 seconds(only swipe required). This resulted in me pocket-deleting my homescreen and several other inconveniences. is there a way for it to be locked instantly again?