Redstone fix

Fixes #1460
Fixes #1458